From 77c7158ecba4b024afa8cdfa03c921923e5dcd08 Mon Sep 17 00:00:00 2001 From: Brian Wolff Date: Thu, 3 Nov 2011 13:10:14 +0000 Subject: [PATCH] (bug 31944). As a work around for bug 31944, don't extract tiff:YCbCrSubSampling from XMP. Several files have wrong type for that property, XMPReader currently marks entire file as invalid instead of just specific property, if there is a type mismatch in XMP data. --- includes/media/XMPInfo.php | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/includes/media/XMPInfo.php b/includes/media/XMPInfo.php index 1d580ff7f3..156d9b5099 100644 --- a/includes/media/XMPInfo.php +++ b/includes/media/XMPInfo.php @@ -631,12 +631,23 @@ class XMPInfo { 'validate' => 'validateClosed', 'choices' => array( '1' => true, '2' => true ), ), - 'YCbCrSubSampling' => array( - 'map_group' => 'exif', - 'mode' => XMPReader::MODE_SEQ, - 'validate' => 'validateClosed', - 'choices' => array( '1' => true, '2' => true ), - ), + /******** + * Disable extracting this property (bug 31944) + * Several files have a string instead of a Seq + * for this property. XMPReader doesn't handle + * mismatched types very gracefully (it marks + * the entire file as invalid, instead of just + * the relavent prop). Since this prop + * doesn't communicate all that useful information + * just disable this prop for now, until such + * XMPReader is more graceful (bug 32172) + * 'YCbCrSubSampling' => array( + * 'map_group' => 'exif', + * 'mode' => XMPReader::MODE_SEQ, + * 'validate' => 'validateClosed', + * 'choices' => array( '1' => true, '2' => true ), + * ), + */ ), 'http://ns.adobe.com/exif/1.0/aux/' => array( 'Lens' => array( -- 2.20.1